Revert 7d3ae24..bc1f169

This rolls back to commit 7d3ae24e9a051352453f5e135b9ad34b1a20728d.