#589 - Use the entity implementation when testing for sandboxable-ness