Do you insist on breaking my local test suite? :(