Reverted to MS 3.2 due to a failing unit test