Revert dfd6ec1..db76de3

This rolls back to commit dfd6ec1976ffbcdcea8fd9c08924a21453a89541.
Revert db76de3..4eb3419

This rolls back to commit db76de3cad3f57f678db524850fc6835a23b2897.