Revert a5eca5e..e37b3df

This rolls back to commit a5eca5e2070b17f2433f5e84c1b802c736111eaa.