Fix the build wrt deadline

I accidentally merged overlapping PRs and broke the build.