Revert "Optimized command handling"

This reverts commit 33d56d5da3958ca38b1100df5c4d416cbea012b8.