Revert "more experimental fix"

This reverts commit 69b7d582d4022883a3ed37b9e3d20be96b162625.