Merge v0.5.6 build-time bugfix
Remove to-be-rewritten update code