Revert #87