Revert "Changes from Mangatome"

This reverts commit 0565b7e3a556d7ff24f0e6bbe31f5efc21bf6c06.