Revert for BC reasons.