Revert hamiltont's suggestions