Revert old useBuildHook behaviour