Revert #57