Revert eb94b28..a2884d8

This rolls back to commit eb94b280fd7df167c4e0fa5b974ddac8dcf4b656.