Revert 7be852a..7091d10

This rolls back to commit 7be852ab6d90581e9e24299a859ddd4bb24ab33c.