Fix compilation issue because of the reverted commit