Revert 566589d..b37d15b

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