Revert "revert latest pull request since it breaksold demoes"

This reverts commit 27b25ee3edb2de14e525abd286b9f62183de14c3.