Revert 8e6bcda..16500ee

This rolls back to commit 8e6bcda670c567a9bd779592617bfdec48a0f170.