Revert changes from 62ba075