Revert "Bug 48917: Fix extracts" - breaks tests

This reverts commit c8020c90476a9abdfd0c7d6502df06a0bc70aa49

Change-Id: I5ac8b28762a5bf00cee17fbf6f3431ba02c23b2c
Merge "Revert "Bug 48917: Fix extracts" - breaks tests"