Follow up for commit 7f36e21ea9d86df5e6fa62d2888891ed957c4639