Revert "Compilation issue fix"

This reverts commit 368cef4f114228e1911858cf06afc73b5200787f.