Revert "Changed 3d and 2d clocks."

This reverts commit 78ecbe102078f9c862dea0ee44dc251ef7478e74.