Revert cf5d459..8b16d3f

This rolls back to commit cf5d459c6fe43abb25b91aa1a0f9bd41305190cf.