Revert 23c0485..b86c638

This rolls back to commit 23c048505649dd088b90fa4abe1e07666e15a581.