Revert "additional '/' related changes"

This reverts commit 189493d77fdd5a2c104115dffdfc6d0b506c5f0e.