Partially reverted 5d6bf03