Revert "removing setting vars"

This reverts commit b620d7883be8a63ea836cc524fdd48c15cf05189.