Revert b09c111..a6237e7

This rolls back to commit b09c111efa492acf08fe40140a80b263ee17b87d.