Revert "dangerous change - watch out!"

This reverts commit 8e90933a6abfb81c41185b853354498d8b50ef3b.