Reverted to previous commit c497dec8fd5f7042610de1a83cac3a6c8da85845.