I'm not 100% sure, but this change may only have been ok in 3.6/master because of corresponding changes in the layout designer dialog. Can you look through the git blame on master for when I introduced this and please confirm that there's no related changes made in the designer to accompany this?