oops, committed my local workaround AGAIN