Reverted changes of GF30681 that affects GF33182