Removing temp hack to disable -Werror