Comments out a bit that doesn't seem to work