First attempt to fix everything that was reverted.