I noticed that this isn't needed anymore with the latest API change.