Revert "Merge branch 'master-chef-11.4'"

This reverts commit ad029806ed03e1810c8828a733ca589f713d2870, reversing
changes made to a7c7aac06b86901f8cccd2a27b8685591d33a757.