Merge "Fix a workaround for "required" property bug."