Revert "11.7"

This reverts commit ea2711cfddfec1882b2c2a9b3110c39343b6190b.