Revert "Merge tag 'v159'"

This reverts commit e1ab3bcd69ee84aa1c40c15b821def8c489e82f4, reversing
changes made to a226fd78e971b26985b8121130bb8876acd3391a.