Re-reverted changes