Revert "dahman soltani"

This reverts commit dbcd9515f351fcd8e363ca3d56be7660acdee2ae.
Tim