Revert PR #1194

As per discussion under PR #1194, it should go into separate plugin.