This reverts commit a8a9d13dc0. Accidentally committed, this patch might not be the correct approach.
a8a9d13dc0