Subtracting hacks / workarounds from 58587 & 58591 since they broke a bunch of stuff, will need to try again a different way