Merge "Revert "Prevent the jumbling up of autocomments in RTL""