This reverts commit 6a59f0560648b43324b5aed51b9ef996404a25e0, because it is causing failures on green dragon.