Due to Werror breakage. This reverts commits a68235d583fccb465694fdfd72eeb8d45d3369c0 and bcee8982a2931960ca29a9e95e3d10355e7393ab.
Due to Werror breakage. This reverts commits a68235d583fccb465694fdfd72eeb8d45d3369c0 and bcee8982a2931960ca29a9e95e3d10355e7393ab.