Revert "hack for demo"

This reverts commit f8e1f98ed43f8866b5324c6aae61bb870d2f57fe.