Partially reverted modification in '2a201e'