Revert "revert these to see if they made a difference"

This reverts commit af6e63dff10c118b42c1ed7991717c1619d5ead1.