This reverts commit 33c237e187. This commit was only necessary until the cache was rebuilt.
33c237e187