Merge "Restore accidental deletion of a return statement"