Revert april first changes