Revert 97eab39..e77e317

This rolls back to commit 97eab39bab3ab98532184a2b027bd1b2fd8a934c.