Revert Intimidate change, it was wrong
Merge remote-tracking branch 'upstream/master'