Use live here, fix bug#3936
Remove dead code
Merge commit '50ca355'
Fix merge conflicts