Revert aa22c9d..71894c5

This rolls back to commit aa22c9df44b2cf995434c0ef58255e0bc44959ad.