Merge "Work-around OS flex differences."