Revert ab0ea4d..c25b89c

This rolls back to commit ab0ea4dbf17a8bf318b9d48de370803faca99cee.