Revert "Rollback Test"

This reverts commit ba66b88d25c4816fa7498c3c16c9b2ca2cb135fa.