Revert de13887..35a595a

This rolls back to commit de13887c91dbc0e67aac3bf59a53e74e503b7d0a.