Revert "mantis branch"

Reverts mohtshm/development#1