Revert "Wind-js branch"

This reverts commit e7dda91a779292d3cfa1c8f5e973d3eab8ba943f.