Reverted previous UF change, wtf? Must never commit/update anything without getting enough sleep first!
Fixed ancient long lasting taint. Taints aren't cool!
P.S. double check everything tomorrow, if no bugs, release 1.3.7