Revert these changes, they should be in a separate PR.