Fix chillu's horrible BC break.