Cleaned up version of #424
Merge pull request #425 from langerhans/1.7-dogechain-clean

Cleaned up version of #424

No comments for 12 hours = MERGE!