Updated to reflect commit 502636ed55