This reverts commit d0ef03a.
Reverted #186928 on behalf of https://github.com/wdvr due to See below - failing builds with older cuDNN (comment)