Reverted a refactor that broke the build.