update downstream branch with step-6 changes
add those unnecessary methods back so I can delete them live (one last time)