Not sure why this got reverted. Possibly a merge issue.