Revert "Issue #3275: temporary workaround"

This reverts commit 6e166266a7aa3a37de7637b84e5ab702fd8b9a98.