Created by: gbasood
Reverts d3athrow/vgstation13#9933
@Clusterfack DUPLICATE DEFINITION IN SEPARATE FILES