Don't return just yet. 1.18 will probably not be as great as we all hope it will be. You'd be better off waiting until 1.21