Reverted:

https://github.com/UniversalMediaServer/UniversalMediaServer/commit/ce02d6bed3ad5e0a10d2c62c7c5208b9d55414fd
https://github.com/UniversalMediaServer/UniversalMediaServer/commit/57f6529a55a7693b972147ada37d4e254fe18cce