Revert 9e78264..9423937

This rolls back to commit 9e782646307546dd3f728ee5920352a250cb0aa6.