back to wizardry

Change-Id: I38a2a313d8435b47e469fcced096fcc0ac0d5adb