Revert 7th april changes