This reverts commit 81f71f1c. Reason for revert: rolling forward with fix Change-Id: Ifc0c53581ac567cb968d91993f453220f8253aec