revert some inadvertent changes