Partial Revert "art:  Few hacks to get working on TP"

This reverts commit 7dc9daeb064e3bcb32cdf25fcc42e44a94cf4c9e.

Change-Id: Ia18c420e897a9a2992d80b9a991e35ff4a05717a