Revert "Merge remote-tracking branch 'origin/PizzaCount'"

This reverts commit 19aa70656210bfcd599280ab733f8a6208834785, reversing
changes made to f9c17c0071b20e71dc1e4b82c932d9a60fdab86a.