@domcleal, verify this change doesn't affect the changes you made in 7cb05aa94e942bd3917c6cde33957288ea84a735