Revert dd98a8e..9668b84

This rolls back to commit dd98a8e763660f33c5f63f518a8e0ee94a899352.