The PR #10448 was doing it wrong and actually did not work. Even its unit testing was testing for a wrong output. Signed-off-by: gnattu <gnattuoc@me.com>