You are reverting #1 . And this revert causes conflicts with `vsc-base`. I need a better motivation for this.