Change-Id: I7cdaa7eac3de0f0782f44ec5be5ed75211c36bf0 (reverted from commit af8636eb055d4cd755f5bb921d691ef3fe3a5b6f)