Revert 7a2bbf7..5fa2926

This rolls back to commit 7a2bbf77ee2b0ef7305bf74936fff85dab53c74b.