Revert "Allow tagging by related class property & constant"

This reverts commit dda78b35cd2a62fbe9964206c9fe2722664369a2.