This reverts commit 607fcf91. This cl breaks art 119-noimage-patchoat test. Change-Id: I9dccfeed4c1a510ddf45aab55ddc2d04d45fe009