temporary changes for demo
Revert "temporary changes for demo"

This reverts commit ccc155b2f8418881139f27d69b3c372a7b721343.