This reverts commit 66465c3b0ab1b32403ad5a1c3114174d87830f54. New change: added missing return statement.