Revert "Revert "Revert "remove foo"""

This reverts commit 28cca4a6add33bff72f824ca89fbff90e3392c02.