Revert "Symbolic fix/hack"

This reverts commit 0574868b1080f97d8447bc9c02fb4e662caef7a6.