Fix remainder of #2211 by stripping extensions off filenames
Fix remainder of #2211 by stripping extensions off filenames

benwbrum/fromthepage,benwbrum/fromthepage,benwbrum/fromthepage,benwbrum/fromthepage