reverting to June 30 commit 94d18b0733ac67b5e1440fa5ee27bec2302cda0d