Revert "Areas tweaks"

This reverts commit 6e2f3d93a6bc7a9d0dc347f540f6a80289e65697.