Revert "Backout 2.2 chef"

This reverts commit 1b68094a8025bfe096adb8d0921d44c45ebd7afb.
Rev bump