Revert this, it's a BC break.