fixing merge conflicht
Revert "hopefully fix the commands after idle"

This reverts commit 9e384699b769b865d40982646ffbe56a40369f88, reversing
changes made to 6a69d9b1343ff85a3de35a494314896177a0c40e.