Revert 1c94ab6..847e318

This rolls back to commit 1c94ab64ac7a289e029be6ad9cd5177ae563a74d.