Bug: 8487047 See comment #12 (fix not applicable to jb-mr1.1-dev) This reverts commit f09eb745. Change-Id: I34e9308be8c36361c3b06ba5b1eb7539244809d1