Continue to remove Foundation changes.