Remove some recent regressions

Coding in daytime is much better. :)