5ce351c492
1) This reverts commit 044a46ed5f040020cf80adc1ace987802344e87d which was broken by warlock 1.3.0 Change-Id: Ia286d9394586884018c4e62cf581e39a809f5545