Remove 1.8 compatible code
Merge pull request #12280 from kennyj/remove_1_8_compat

Remove 1.8 compatible code