Fix build errors (sort of) (and for awhile)

Revert "Fix typo"

This reverts commit 0482291f45a8fa1be8bbfe87e3c8a4eb7f43ddef.