Revert d616e48..3e9473f

This rolls back to commit d616e48553c8c5beda04cf0f49c66eace447caa2.