Revert "Missed these"

This reverts commit c608b171f3655004438897247f2435680f34e7ff.