Re-committing actual changes from before