Re-enabled command parser