revert partial commit from fd97c34