Revert "Issue #328 revisited again..."
Revert "Issue #328 revisited."

This reverts commit b53afa5a782aa7fa93b344256f6a6d5cface6ed4.
This reverts commit 5f75e602003d7a58e6da55d8b8791cae4daa8ba1.