you have a lot of patches for acs-core? This should not be necessary and sounds to me as if changes were local changes brought into at the wrong place.
anyhow, my positing above was on feb 24, you see the changes in chronological order in [1]. I think, [2,3] should be sufficient ... although i would not recommend to much cherry-picking.