Tweak this for new instance
Revert "Tweak this for new instance"

This reverts commit 889f9904b128bbd6d2d33035d52d5a3b96c57a57.