Revert 37e939b..d367904

This rolls back to commit 37e939be4f3d1e2c951fd3ceb82026dcba6f0917.