Extent fix (Issue #8)
Revert "Extent fix (Issue #8)"

This reverts commit 50239aedb1142b5ff66ec1563433fb3bec287712.