Testing Rollback feature
Revert "Testing Rollback feature"

This reverts commit ed1d39c79f8a8c6532ac96089d37e5cff5ba1dad.