Uncommented some category code that should work again