These changes should also be reverted (as well as the equivalent line 64-65)