Reverting patch 3408 (Bug #547932)

Change-Id: Ic81c34a2bbd448bca78f353fa75317073844a19c
Signed-off-by: Valerii Kuznetsov <valerii.kuznetsov@totaralms.com>