For this pull request, I wanted to minimize the about of churn (it's code freeze day) needed to get these two methods back in back-compat working order.