Revert 69e62dd..490f9e8

This rolls back to commit 69e62ddd291d5b51e38143ee1a902b24af53dd0a.