Revert 5581afc..2a2ba4f

This rolls back to commit 5581afc66c7c0c87c03b02cc3723a57df119511e.
New archive