Further discussion needed. This reverts commit 2403465ce5. Change-Id: I1268023a05959e0a554c2fc15dcec93250e527bc
2403465ce5