Revert ad31bca..9e90c0f

This rolls back to commit ad31bcaa4f021d66d2b14b756d8e687e311eaa79.
Merge branch 'master' into marty