This did not help anything and it makes image builds slower. This reverts commit b57a77e571.
b57a77e571