Reverting most PIL cleanup.