Make compilation work again after the changes in commit 354e21824922c551e7a1f3db8ab04a9b08c83e6f