@mikejohnstn  - how's this https://github.com/wordpress-mobile/WordPress-iOS/commit/348ed3a5a7bbddc3471cf5fda4d9a6e05614deb0