Add our old features back in

Change-Id: Idfb97375678a8ce7512ce0ebee286dacefd37a66