httpd in OpenBSD 5.6

[jorisvh]

Prior to OpenBSD 5.6's release I read that apache2 would be replaced by nginx as the httpd(8) web server.

In the 5.5 to 5.6 upgrade guide I read:

OpenBSD's version of nginx will be removed from base in favor of an internally developed httpd server in 5.7. nginx will be available as a package for those with applications dependent upon it.

But the 5.6 httpd/httpd.conf manpage doesn't show any reference to nginx?
It even features:

AUTHORS
The httpd(8) program was written by Reyk Floeter <reyk@openbsd.org>.

So is the current httpd just wrapping around nginx?