Commit db1035-related live hack

Grr. Committing so other people can actually deploy stuff.

Change-Id: Ibc86597a126e3a1cbc3642864afc559e5fafe6e9