Revert "BF: supposed fix for the gh-439, but still unable to reproduce O...

...P."