Revert fdf929b..575da53

This rolls back to commit fdf929b8c726d97e5e612a958b03e834edc09ffe.