FYI:  This is going to conflict with the same change in #884