Ported 'RedundantInternalIssue'.

Had build and commit issues, all fixed.
Merge pull request #428 from TheCommieDuck/redundant-inter

Ported 'RedundantInternalIssue'.