Revert "Revert "remove foo""

This reverts commit 6be0dcc3af141f8ebfe4cc30bceca2355253a73f.