Revert "merge smarius pull request"

This reverts commit 2d2ab180665e8541c10a102da89bd7248fc6d4fd.