Revert d32a773..6577e0a

This rolls back to commit d32a773a7f42cd8a93e10232701943f4ba5e640b.