Bug 959061 followup: remove else after return