Re-opening following a discussion with Neil, looks like we have to revert for SP2 :/ Revert approved.