OS-3335 atomic op changes broke lx build