Revert 3ab9a50..68aae92

This rolls back to commit 3ab9a50cd5551b03690de212f322e4d530260728.