Updated to use the latest 6u4 baseline