Revert 2dadeda..d7b00eb

This rolls back to commit 2dadeda46c830ec2c3cea7c490218b9acdac982e.