Part of commit 6f14167