reverts David Lee's work on 4304