Revert "BUG 410 -- update to new platform"

This reverts commit 38bdcea60afaa661a864febd74db3327a2e7b73c.

Change-Id: I89bc0bdcaf30967c529e6ae003bb94f72571a8e9
2 files changed