Revert 2e6e389..676ed76

This rolls back to commit 2e6e3899cb464d5709624f3fb66fda982d55049c.