Reverted SDK 2.4 changes