Added deleted methods back as they are needed in upgrade process