Add back in changes for Bug #2106