change to build with latest 4.2.2 sources