Revert 92b6b7b..45dd195

This rolls back to commit 92b6b7b30a1fccd5850f81a4f14dd94bf592cb73.