Revert #38