Missing part of commit 500faa3ca