This is a temporary measure that fixes #2692. This reverts commit 15ef8858.
mentioned in commit 4badb270
mentioned in commit e6137d42
mentioned in commit e427f091