[#2265] Slight revert per @Stof