am 40990623: Merge "Remove Atom workaround."

* commit '40990623cd268dfcf5503abcd58465d14453d2f4':
  Remove Atom workaround.