Revert "Changes made by Kaloyan Kotorov (kaloyan.kotorov@telerik.com)."

This reverts commit 2f14ef968fa11e204bb7e230bc680f4fa49e9512.