Revert "Revert "3.0""

This reverts commit f31a971384397b00be6172711ab3b1fe2148aaa3.