Revert "1.7"

This reverts commit a2c3037d7080d952ce19567714a005f26c1bb320.