reverted to previous functionality