Revert 79ac6e9..f2ae6fa

This rolls back to commit 79ac6e99055030b9f3c7ff95a327c8cda6d34123.