Revert 5709f89..11ffec7

This rolls back to commit 5709f89e82a6a3650644fd6570c08e09b9ae963c.