Revert 7d8efa2..ee61992

This rolls back to commit 7d8efa2af590cf946576a602d5db6f4a0a773c59.