This reverts a change made in 40c60efecc0fc73f0b2320b44d684586b52ee799 which was incorrect and caused CacheKeyWarnings.