Fix rebase error
Fix rebase error just committed

Test Plan: See that page loads

Auditors: jack