This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177. Original commit (for which this is effectively a rebased version) is 72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang <leijitang@huawei.com>. Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au> Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600 Component: engine