Revert "Updated versions mapping to be more ES-like (bug 892618)"

This reverts commit 7456461073579b752e7d5df3619c41b2e2f5cb16.