Fix the merge again:
Update the code for making it works with sabre