Revert some enum changes, fix early getMessageThrottle