Revert the preceding four commits -- wrong branch.

Authored by hein on Sep 19 2015, 10:45 PM.