Rev: Revert recent commits

Revert all recent commits back to 69b6434 that cause test failures.