Updated for change in commit 9a3a1c500195b6eee897c6a28810bf9d04e51385