This unbreaks the commands broken by the last commit. Everything is still better.
This breaks some commands, everything else is better though.