Revert #37
Prepare 0.25.0 release