FEND-943: revert back the original one