Revert 49f14d6..737b192

This rolls back to commit 49f14d679fc7399ee1bbc03b48403d286ac00754.