This is a bit hackish and could benefit from further cleanup.

Change-Id: Ibb8eddf88bffdea41fd94fea09ad6499d05ae715