Sync 331

Thanks @mseaton!
Per the above comment, we can just change these 2 utility methods do what is laid out above