This reverts commit 0f675d8d. The test name is too long... Change-Id: I4496501e73dcf6424e9c58b331e3d3b241aa7917