This solves compilation issues from the future.

(cherry picked from commit 1df0c91531e3e5b6466d4d9735cd4e1b7792c02a)