Please keep this change for your own fork, don't include it in pull requests :)