Revert "Squash commits from CM for making lunch faster"

This reverts commit 8f83e5e87d56d2ddc89dc473bc11654b1292a838.