The bug has been fixed. No longer needed. This reverts commit 5a3c231d. Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664