Revert "updated merged"

This reverts commit 8317c920e9089f8c8d2d30e017fecc387297537c, reversing
changes made to fe514e8187c8ae61d6b423058b7efa31a54eeb9c.