The original patch that forced internal usage hid an actual issue in the build system. Replace patch with upstream one. Also reorganized the Makefile a bit and removed some cruft. Signed-off-by: Rosen Penev <rosenp@gmail.com>