Tweak to make compatible w/ some other gems we're testing out