e7d0c30523
Breaks shit if the deprecated map pr is merged before/after without me fixing it so only merge one of those