Per comment above this would be removed, right?