Revert 6d4bc77..2dc2940

This rolls back to commit 6d4bc7710feef047987e2f25bd286fafd5c48554.