I'm not sure what the difference is exactly, but this just
keeps the previous behavior

Also remove the now-unused workaround files