Revert 7e19390..d9bd079

This rolls back to commit 7e19390e1c8982a4d2358d49c5255041a79c8ea4.