[#924521] Removed another hack...