Revert "Simplify."

This reverts commit 0eb2ee2b20a0cf621603766077afd3924bb670b5.

Not sure why all these commits were merged to FW_5_2. The commits
that were meant for 5_2 were already merged. This one relies on
a commit that is only in master.