9abf057340
This reverts commit 09d6a3e68c3d95e27ce7a7395735d058062e9d17. It causes failures during brown field upgrade. Change-Id: Ie619358bd0ae046bfb94b9e9d811251b54d2897e