upgrade to 6.3.1
remove patch