Revert previous 2 commits

It works fine in CLI, but appears to time out on the console.