If we do like this it's easier to test with 1.6.4 :P