Nobug patch

This removes the duplicate makefile and reverts the problematic patch causing master to fail.

A conditional statement means this change will not run on leeroy. No point in waiting for it to finish.