Revert ecef523..8689e47

This rolls back to commit ecef523f5cffab82dedb3899a6f0d8bb7998476c.