revert to atomic's cf443a6a4c