Commit b2138a2014e7cac92df5566b470c7a32b0c3fd15 reverted some changes by accident. This commit is a partial revert of b2138a2014e7cac92df5566b470c7a32b0c3fd15 to add those changes back.
Commit b2138a2014e7cac92df5566b470c7a32b0c3fd15 reverted some changes by accident. This commit is a partial revert of b2138a2014e7cac92df5566b470c7a32b0c3fd15 to add those changes back.

rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir