Revert pr #339 again

This reverts commit c6b9cf047d52887ea3ce29617f0decfb5fe84503.