Revert e7c0b30..44b2968

This rolls back to commit e7c0b3051e20054a9f90e45fdeb5aefb2fbe2f12.