Revert 66fd0d059627a2b424971651742da43be9a9c40c since it requires Momoko==1.0.0