Revert 0ac2fd8..4613102

This rolls back to commit 0ac2fd8267faa3211a2dce2fdb1f8393df12b218.