Revert ab833e6..942a587

This rolls back to commit ab833e663bbb475e6dd5c569954757f789f5b785.