Revert "implemented #1028"

This reverts commit 87aeda27f20e9513a7b901032449a9b23aa3e299.