Yes, this still needs edx/XBlock#200 to be merged first