Revert 88c6854..e5a7dc2

This rolls back to commit 88c6854416ce3e062cecbaacc1b216538327856c.