Revert "**BREAK BUILD FOR DEMO**"

This reverts commit 8b64eed8e51a0f6b9d6db640ebd7e98d212ed66a.