Revert eb9e327..577fe36

This rolls back to commit eb9e327c3356f92e47e5828257d5363101cd7544.