Merge "Remove Atom workaround."