I've committed a fix so that this doesn't break other users even though it's not actually removed yet.
