Saves 8 MB from the data download. Sorry, Snapshot!
Merge pull request #5975 from Asanadas/master

Saves 8 MB from the data download. Sorry, Snapshot!