Revert 90d537053d2515dd867f0b43fd9c795a75f27a41, add #52 task