Rolled back to earlier version
Revert "Rolled back to earlier version"

This reverts commit dfc04ba0a4c6093116fd3e81f3c31c9706ee935d.