Revert b6379a4..0e03d84

This rolls back to commit b6379a409d1ddde3ddfca9599327fc11a99efbf8.