Revert "merged changes"

This reverts commit b4499c8c6cb9c0054681e15a27a36aa41dbad400, reversing
changes made to 738ed5e8e7b15fbf7032662e246e5339f9d46e63.