Back out D2D region refactoring and optimization.