Revert 2a8030a..fbe1871

This rolls back to commit 2a8030ae9492051d6bf7a0cc35a8cd7fc78c7e3a.
Zoom 2d