Merge/rebase re-added this yet again.