Revert mustardBees/patch-1 because of broken unit tests