Making the previous commit compilable

(Please hit me.)