Revert "Merging Tim's changes to OneOffs"

This reverts commit 342aa25acfcddc41e1928522e22b57ca857c475b, reversing
changes made to bd50f7f9cf8c1092b566a579e9ece3e8460184f4.