Revert "Merge branch 'V1.0-|-First-steps'"

This reverts commit a602119e7b343470b88879718052836e96db6762, reversing
changes made to 34c8aef113a537b270481b2b859d1939df953a61.