MAINT: fix up incorrect changes in previous commits.