Merge "Remove Atom workaround." into lmp-dev