Revert "Merge branch '620-spin-inline' into develop"

This reverts commit 5ad25c0c35a135a0d2730877e17375c006cc0214, reversing
changes made to 37beb3ce921bf9325668baa0b39f6863810a82e5.
Revert "Merge branch '620-spin-inline' into develop"

This reverts commit 3b1e10ae0ec1775cf487d32d50ec1525c43033b2, reversing
changes made to cc4fb14aaec582064486b102de850f7dbc62719b.