This reverts commit f142de5f44. Revert until we can move to 2017.11 Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
f142de5f44