revert mistakes in previous commit