Merge pull request #446 from compnerd/sometimes-code-is-ugly

Revert "Use numericCast() to get the correct type when creating a dis…