Revert #35