Revert "Fix name-suffix crash on rotation"

This reverts commit 32c91fdd680c55836e235255fbb5bdba27cb9ca6.

Change-Id: I8d014c70e04b747545075e6b287a93a1126bf4aa
1 file changed