Revert "Revert "[6.66]""

This reverts commit 5f9fdd55c48fa1bd9b0b5bce92ef2f54e0fb5eb7.