I'm going to remove this and the makefile definition. I'll save them for separate pull-request down the road.