Revert "hardcoding"

This reverts commit 7bac9316916175c5d19c5907165eb5d1491fa424.