Update for #771 - instead of removing the old methods, deprecated them so we are backwards compatible.