Revert "Mark files from origin for merging"
Revert "Mark files from origin for merging"

This reverts commit 4d23c208587749d29a3d967f59e6ab659c0a7ea4.

joshua-s/airbornos,joshua-s/airbornos,joshua-s/airbornos,airbornos/airbornos,airbornos/airbornos,airbornos/airbornos