Revert "Merge branch 'master' of https://github.com/chidychi/Data18.bundle"

This reverts commit d5cbd0da95febb763b0b661e757628c2b405c0aa, reversing
changes made to 4e2195528166cb0d9825243a81929568e27599eb.

Messed up a merge.
Attempting a fix