Re-applied changes that got lost somehow.