Revert #68