[CB-1849] Remove iOS 4/5 conditional code block, put in main block