Revert "Properly support CommonCommands"

This reverts commit 6384f667e3c3102764c9c3217b69dafc6f0ba43f.