Can we put this behind a waffle flag so we can merge and push this code and then enable the waffle flag after we add the `manage.py` command to the build script?