Revert previous check in r168581, r169079 as they are still in code review status.