Revert fb5d9db..44a7e44

This rolls back to commit fb5d9db6130e13366e142e70589e845e2f3374b2.
Revert bde75a1..4c78eb6

This rolls back to commit bde75a1acedf31995ae4b0099077592df5346c5f.