Remove workaround

Fixed in 2.8.9. Given that earlier version only have a warning
not an error no need to clutter CMakeLists.txt.

Change-Id: I11410c92f160ba846a9591e670bb7757a5e31bf3
Merge "Remove workaround" into release-4-6