Revert to master to make tests pass