Revert "**BREAK BUILD FOR DEMO - ONE LAST TIME**"

This reverts commit c847910d6c7541825baaa8493c3da0b445b13a4b.