Revert 7b201bf..60f140a

This rolls back to commit 7b201bf6940e2cdd1f14f67bd21cc9459c9519e0.