reverted the previous commit which is not backward compatible