Use customized escalus from the branch

NOTE: This commit is not intended to be merged!