Revert "1.9"

This reverts commit 3bbf14e9e56f50d224c7007ecb3d993897a339f6.