Revert ba7edc8..923fc10

This rolls back to commit ba7edc86cc3fc7b34c83b744f2bfbbe63d87185e.