Revert d5de94e..6986608

This rolls back to commit d5de94eb4f4fe53a20b1e38c42f38c23ee2d788a.