I'm pointing this at my buildpack fork, until you can certify that it works for your setups as well.  This way rollback will be easier, than if we update your along with this pull-request.