Revert 6e8b2d6..dd4eb75

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