Revert "2.5d"

This reverts commit f57a96f8c33427cd133e110b9e40fe65315132b3.