Revert "Performance improvement for 2D for large screen devices"

This reverts commit a45da361b87fec96667d2f5b4d8a0ff47c8cbe72.