New version
Revert "New version"

This reverts commit c6e6dae3522b89c96157c4204454b2995defcefc.