Changed the binding redirect hack to BeforeBuild rather than AfterBuild.