* commit 'cb906677fc65fd1b43f6dc3b8e029711ec8e86dc': Remove an unnecessary condition from previous change.