This reverts commit 4693ee0ff7. As discussed in GH #3168, this works but it is not the proper way to fix the issue. See following commits.
4693ee0ff7