Fix build breakage in modules caused by commit aac1a8ec