Undo porcelli's hack