Revert removals. Let's match production first.