no wannabe magic please

Change-Id: I1ff979ab222ac230593c9f513f7b07c0e5e624fe