Revert back again to 3.6.9, I'm tired now..........