Revert 6a458f4..3308dc4

This rolls back to commit 6a458f4e8159517466d8463b9ec89171d6b16282.
Repairing lost data due to weird merges