Revert "Put a wrapper at fixing wierd issue with the makefile to allow builds to continue."

This reverts commit ce75abbb6e8feba56adac6243d919754f18755ba.