See [d7ff893259] for branch w/ offending code removed (wholesale). Will need to be reviewed/replaced.