Revert 6135d44..2bc257e

This rolls back to commit 6135d440d4582ab6e5ee71ea117883a5bb37971d.