Revert test to previous state from 10 days ago, now that we've reverted the API refs #4878
Merge remote-tracking branch 'origin/master'