Undo 2.0 vs 1.9 compat hack for nullable properties