Out with the old and in with the new

Change-Id: I615ffb04791abe6c749e79f07dc2edce33b33b46