It seems the commit 08fab316a1 calls for more changes: