restored changes reverted in previous commit