Revert 022c0ae..f0b305b

This rolls back to commit 022c0aedd61bff95b65a5b51d20899997bfebfd3.