pre-merge
Rolls back post meta-disaster