Revert "merge capture-staging"

This reverts commit 97bd9a2f5359e7e5b965f33811177ffcc7227b69, reversing
changes made to 5b4e8bb7430ed1ae96393113917483102c434bd6.