Revert last three commits - pushed to wrong branch.

This reverts commit be78c8c4270c759af380341bfdf19b9a9fdde48c.