Fork of APC to fix issue #1984180