Revert "Revert "1.0""

This reverts commit 7fcfd8a634c2d8e990d5e7a192d7a267307eebd8.