Revert 3816334..03c9639

This rolls back to commit 3816334641199276cbae0507e594a3b5da2bed13.