Revert a78054e..37bbfe5

This rolls back to commit a78054e65466f8f91db8c45ee4f174a381dea9f1.