TINY-2858: Switched some logic based on review
TINY-2858: Switched some logic based on review

TeamupCom/tinymce,FernCreek/tinymce,TeamupCom/tinymce,FernCreek/tinymce,tinymce/tinymce,tinymce/tinymce,tinymce/tinymce,FernCreek/tinymce