rollback and fix tests
Merge remote-tracking branch 'origin/master'
IDEA-134355 Please fix the text of a tip of the day