Revert until I figure this regression out