Merge branch 'LRU'
Merge branch 'master' into LRU
Revert "Merge branch 'master' into LRU"

This reverts commit 177649964a0908213900355b14a6c69e71655091, reversing
changes made to de1fef66f8eec93e3aba4bda5431abdf6c16bbb4.