MON code optimisation on behalf of TSC This reverts commit 6eda48bf. Change-Id: If697df74221be72aca9630630e64033f06ece473