Revert "s7r auto adding"

This reverts commit 8e767956c2c569ab492ce2b6513387aff82dbf7b.