Revert "Whitey"

This reverts commit a2cc8e2a8f7eab642da935e4155fe1341004cf6e.