Rolled back to 1.6 target and source level