Revert "Revert EchoDev's commit until I get permission from YePpHa or he...

Reverts YePpHa/YouTubeCenter#1141 as #1127 is a good idea.