Removed an unnecessary if.  Fixes #140
Merge commit '9e9d99e9187093b459525e3fd7e654d57000c3c4' into kitchen-sink