Reverting overeager code removal...