Reverting fs_utils.cpp and fixing callers instead