Revert "Tweak ignore rules just a bit"

This reverts commit e59a6e5324198207801e74228efa998a4dc7046d.
Merge master