FS-6956 modify commit 16365501 to use one single line which is only tolerable way to have bracket-less if stmts.