This reverts commits:
daaff419.
64d89567.
fffaf5d2.
f7c91d33.

These changes removed/added functionality
beyond the scope of porting 2.7x to 2.8x,
where only minor changes were needed.