Was reverted on internal master already. This reverts commit f8d051c8. Change-Id: Ia432f83bcce91366fb23f1bb87603a093b7f074d