Revert "Refactor: call commands following docs recommendation."

This reverts commit ec7486dd1e8776dc965268daf4c0fa7af94ce091.