Is this 'return' really supposed to be commented out?