Revert dd48f9d..fd871e1

This rolls back to commit dd48f9d706317f105880aad5d763f37b1746985f.