makes paradise test fixup apply cleanly to master after a4a43a19b4