Revert "rotator: update from CAF"

This reverts commit fb9b43c33fa6eb48f60d83b8d71b09aa6d5ee180.