Revert 48b2283..a784f03

This rolls back to commit 48b2283c61c50ceca462a7f90ecb272b0e9239d6.