Revert "merge from siddii master"

This reverts commit 54b6788118ef69aeb9e7449dcf783f3d9d16f9cd.