revert a possibly incomplete merge
revert a possibly incomplete merge

This reverts commit f114ef9612bd8ad4b1d2485b0c5ba8999e5da8a9 and
commit 27b465e41d40a1c9ea665a5e31d792ada7b90d88.

There is question regarding whether this rebase was done correctly.

razr/opentts,razr/opentts,razr/opentts,razr/opentts