Revert "Rollback test"

This reverts commit e3d6fd8054c46c1be7697bd37ef25cf9668b8f40.
Revert "Revert "Rollback test""

This reverts commit ad2ad8d58283621d4342924a440a06da1b143797.