This reverts commit a56663f6. Reason for revert: Original breaking change was reverted Change-Id: I8e0c97f0b511f686f5efdb8a9e8c9f862fc41010