Revert eb92cff..109f557

This rolls back to commit eb92cfff6a32d24d50f9d99ecb6d65dea9decbe0.