See check-in [02f09cdd6c]