Revert 73f9023..fdd11c5

This rolls back to commit 73f902391de49c404f8107e09dc9d9f4fede615f.