Revert "Merge pull request #408 from kmroz/wol-5"

This reverts commit 73ecb849d2f15b4fda286bb3e0d7fc8c2016a76a;
not ready to apply yet.