You'll probably want to replace this with #264.