Not beautiful, but doable.

Change-Id: I6f3b00d620e7d7d19cc05ec4239deeb14d0d5201
(cherry picked from commit a2a1a59a)