Revert to previous functionality