revert bad patch for BGDA - disables too much