Revert 957995f..c08b2af

This rolls back to commit 957995fc530c7ddb540a714fcc44fa31415ee54e.