am f084384e: Merge "Remove Atom workaround." into lmp-dev

* commit 'f084384e0d00eb169928199bf1093e7f0a53358a':
  Remove Atom workaround.