Revert 742327b..2fa6c31

This rolls back to commit 742327b87ae84639fea4a676670a270dd41fe57b.