Commit a live hack.

No idea by whom and why but the live hack run into a merge conflict :-(

Change-Id: I8daa5d11ffca897d67ad2a46cfc4f42440912dd8