Revert "Changes made by AssiNET Assi (Assi.Ivomir@gmail.com)."

This reverts commit 03b64a37a4b443562a31f10f003b9d248a00f311.