This reverts commit e05c1038. See parent commit, there's a bot which isn't captured in the XFail list, reverting til I work out what it is.