V0.5.10: [base] revert commit