Revert 76e219e..0e84208

This rolls back to commit 76e219e394560725f3a031b14a82f58b66783a00.