This reverts commit 0788be818b. This change was technically incorrect. Reverting this change for now until a better fix is in place. Likely this will require an extra parameter for controlling this.
0788be818b