This reverts commit df77d46645. We will be handling this in a much better way with glib in the future.
df77d46645