Revert "experimental fix of issue 4787"

This reverts commit 814ca19f26f5a775766015124146289c3f361cdb.