Revert "Merge remote-tracking branch 'origin/unbreak-standalone' into async-scan"

This reverts commit a08c6d2011f83ff207c5afb513a1b4f7c3ae9697, reversing
changes made to e3dad629e427aff43f624790dc0d92cdbf810640.
Revert "Merge remote-tracking branch 'origin/develop' into async-scan"

This reverts commit e3dad629e427aff43f624790dc0d92cdbf810640, reversing
changes made to b796d3abf5f6360e508e473771c2c163520f42cf.