Revert mistaken merge