Moved BadCommand and BadSubsystem back to their original positions