Revert to workable copy

Change-Id: I6ff9cf60531aa18242eb26cdf34e5c0d26c0d66f