Revert "Hopefully fixed crashing on adding command(s)"

This reverts commit 6d9ffd801ede367efbfef4a8958c12f8dc805554.