Revert "feature #711"

This reverts commit e2eca0b579912f1cc39456740d3b07457e6d1c75.