0.6.3 remove fixes for 0.12.3, fix import errors