Preserve more 1.8.7 compatibility, don't use File#path