Revert 2c70dfa..5559310

This rolls back to commit 2c70dfa4497ad6c78b1172a74c1f368c775f0803.