Revert "Made a quick change to fix the paths."

This reverts commit c02cba12fe4523bfc35b80744b33cb29f6f72bcc.
Revert "Implemented Tony's modification

This reverts commit f3fdeb5cb3805a43e516a4c22fc8bd65d661b413.