Revert "Move over latest changes."; was from master.

This reverts commit a9cb8a49f47fb326b8533c295d841404d63311bb.