Merge branch 'rerevert-unreversion-of-reversion' into 'master'

Rerevert unreversion of reversion

This commit got overwritten somehow when things were being merged into master. It's kind of important. A lot of maps will break without it.

See merge request !6