Since the code is now separated into the common helper, we can reuse it
instead of maintaining two copies.