Looks like master is still failing with the same errors after the revert