Partially reverted the previous commit