This reverts commit 40edfdfdd7 as the change has too many side effects to be included in a bugfix version.
Related ticket: GH-2531.
This reverts commit 40edfdfdd7 as the change has too many side effects to be included in a bugfix version.
Related ticket: GH-2531.