Revert 9c0d670..7ef50b2

This rolls back to commit 9c0d6707462285fa325c38f0938540e36b4e34b3.