Revert e02c358..0b302e5

This rolls back to commit e02c3584497991aa4317a2c043c6977987bcb23f.
Revert "Revert e02c358..0b302e5"

This reverts commit 3e55c952f398136331f975abd93cff6adcf95c67.
change version