Merge "Revert create/update/delete database for apps that bypass restrictions." into rvc-dev