This reverts commit f6b2c6ec. Reason for revert: TextView interracts poorly Change-Id: I57496aaf946972791c9a2a1ecc64151f1111f11e