Reverted 374_339 change as it's broken, and relies on a hardcoded path