Reverting some code that fixes one thing but breaks another... needs more testing.
Optimizebot