Revert "2.7"

This reverts commit 38edaf354b4a618cd39c7f7102c9771aa5d68122.