Don't use  when SkinTemplate can provide

Change-Id: I97ac906bf2d17af86d0710da52d4a54bae69b093