Reverted some code for support Fx 17- (#150)