Revert last two commits. Broke wikibits and don't know how to fix it at the moment.