Revert 810ba32..f712966

This rolls back to commit 810ba321cd0fe7e2bfcae92358f8678022b98004.