Revert "1.1 Extend"

This reverts commit 79b3478d243c77e59040684c57bb1258dfa749c1.