Revert "Foodcritic cleanups"

This reverts commit 75659d82d579295be30d264f5e4546e116cb1edd.

Conflicts:

	attributes/default.rb