Revert wrong "rebase scape-2.x"

This reverts commit 19e99b9296812ef647194ffec01d3e38c6eeff22.