Revert b1d6323..e07ae05

This rolls back to commit b1d6323f8376cc85f27523e2ed4b4f9850ec2f04.