Revert edaeaa1..87756f0

This rolls back to commit edaeaa1b21eb47f77d8640feba1f2afc2f06c672.