Minor fixup in the build system

- Reverted one of the changes from two commits ago.