Revert "First commit failed, attempt #2"

This reverts commit 4968a9960ef1f1cd5ba3687741d173a3fe2aca1b.
Revert "Revert "First commit failed, attempt #2""

This reverts commit bad8d8e69d3eaba1313a0beddb66cc3455eaed2d.