Revert errant merge