Reverted to latest Ivcho's commit

This reverts commit 3bd5806dfad5c5e9dc0d3112a6af6f8074ef9752.