Reverted Changes for 1.6 compatibility